Recommitting changes that were moved aside to tag GTK_2_3_1

2003-12-08  Federico Mena Quintero  <federico@ximian.com>

        * gtk/migrating-GtkAction.sgml: New chapter about how to migrate
        from gnome-ui/bonobo-ui/etc. to GtkAction.

        * gtk/gtk-docs.sgml: Integrated the above.

        * gtk/Makefile.am (content_files): Added migrating-GtkAction.sgml.

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 9bc88d32b588c364a25da0df74c424e5f8c6d81d..3b13cc571ffb719db10669e05662943965d8f296 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,12 @@
+2003-12-08  Federico Mena Quintero  <federico@ximian.com>
+ 
+       * gtk/migrating-GtkAction.sgml: New chapter about how to migrate
+       from gnome-ui/bonobo-ui/etc. to GtkAction.
+ 
+       * gtk/gtk-docs.sgml: Integrated the above.
+ 
+       * gtk/Makefile.am (content_files): Added migrating-GtkAction.sgml.
+ 
 Mon Dec  8 12:47:01 2003  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/Makefile.am (IGNORE_HFILES): Add xdgmime directory,

diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index be1b43766e844495d1f1ffe28f16a3265297cfca..37bd2431dbf6deb65c9caf0a51c39e041f8f2aa7 100644 (file)
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -87,6 +87,7 @@ content_files =                                       \
        changes-2.0.sgml                        \
        compiling.sgml                          \
        framebuffer.sgml                        \
+       migrating-GtkAction.sgml                \
        migrating-GtkFileChooser.sgml           \
        objects_grouped.sgml                    \
        question_index.sgml                     \